]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e20f643) | patch
merge: calculate number of wiggles more accurately.
authorNeilBrown <neilb@suse.de>
Thu, 7 Mar 2013 03:09:46 +0000 (14:09 +1100)
committerNeilBrown <neilb@suse.de>
Fri, 8 Mar 2013 01:29:52 +0000 (12:29 +1100)
commit31bf38698cb4e0cb9246045d7fc33f32b2e1986c
tree87b33be0b77058ed2a6acdd51fb7c63175806f11tree | snapshot
parente20f643ae0f0944f0fda81774a94ea97f5106727commit | diff
merge: calculate number of wiggles more accurately.

Assess wiggles the same way that we assess conflict,
and then count the number of each.
This gives more meaningful counts.

Signed-off-by: NeilBrown <neilb@suse.de>
merge2.c diff | blob | history
vpatch.c diff | blob | history
wiggle.h diff | blob | history
apply rejected patches and perform word-wise diffs